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

Change-Id: I0424009e80e845c8dca6d59a714d0f87d1b26067