Merge "MediaSessionCompat: Test for checking NPE in setCallback" into nyc-support-25.1-dev
am: 104e37eb4b

Change-Id: I6db2595d328350115f16fbb89fb678a908a9a541