Merge "MediaSession2: Ensure NonNull/Nullable for parameters of public methods" into pi-dev am: 5cef8984 am: 20064071 Change-Id: I5cff047f7200ed85424c473ffd699fcc2f3bddbb