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

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

Change-Id: I200895da04e115de82b1b77e1b96cc63f8b26528