Merge "Fixed that texts of players would often remain empty" into rvc-dev am:...

Merge "Fixed that texts of players would often remain empty" into rvc-dev am: 7387faf8 am: e9f3fa53

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

Change-Id: I7199f6167469e52677ef7e31e5c535f76ecf0412