Merge "Merge "Fix song title size in media controls" into rvc-dev am:...

Merge "Merge "Fix song title size in media controls" into rvc-dev am: ebfd3e9d am: 4922fc5d" into rvc-d1-dev-plus-aosp am: 2c223335 am: a814b77e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11935091

Change-Id: I0987fd9ae45ca7a154cd150b0268622d6d4ca740