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

Change-Id: I16d5f8f5bb855b7711466bb922bec2f03bd9018b