Merge "Ensured that all players have the same size" into rvc-dev am: 96c2a56a06 am: cd65ebbb17 am: 527dc4b0b4

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

Change-Id: Ifdf503ce85d2838df80f1b4991db33e7330a29d1