Merge "Enable some tests in MediaBrowserCompatTest" into nyc-support-25.3-dev
am: ff4e98295e

Change-Id: Iede78d089c68e2956dff369448fd019d41c10b71