Merge "Ensured that all players have the same size" into rvc-dev am: 96c2a56a am: 531840ef

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

Change-Id: I7ac8fe63d1713593170b8df56ba62a629acf6f95