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

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

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

Change-Id: I8f29f9cccb7676c4982a39fb5d6166717d7381f1