Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev am: ecff3f95ae
am: e64d563760

Change-Id: Ia57cc993a5dd1295691fb2bc56173bc8dcdeab10