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

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

Change-Id: Ia6722701b2ca8313f7f59f8c788db23a832069e1