Merge "MediaControllerCompat: Fix the test failure of getRatingType()" into nyc-support-25.3-dev
am: d9d2169ca5

Change-Id: I5aadc7c88e0b68ef26259a9abc26e1b8fb6230d0