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

Change-Id: I93c7e277ceb5e0dcfef02d279d8334bc0ded4d98