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

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

Change-Id: I66ea7488832afd33e9dabb5e6db63c36fa0c8cd7