Merge "MediaBrowserCompatTest: Enable a test method" into nyc-support-25.2-dev
am: 4edfa7d740

Change-Id: Ibed48daa609248ebc892625387fadb6398b6d0be