Merge "MediaMetadataCompat: Add a metadata key for ads" into nyc-support-25.2-dev
am: 64d69cdfa9

Change-Id: Ic7ff9fae282867454755391cad223c0361212323