Merge "Fixing BT Media Metadata issue in trout" into sc-v2-dev am: cc08d2e6bd am: eec9eb5604

Original change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2123524

Change-Id: I99ace767b0b605962c6ba9c983b5605a2f4a9c6d