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

Change-Id: Id493a04e639f422d60e1a845958107ccd4b13056