Merge "Fix weight of media to be 1 in landscape" into sc-dev am: b886e41a...

Merge "Fix weight of media to be 1 in landscape" into sc-dev am: b886e41a am: b899d6e5 am: 93f95179

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

Change-Id: Iccc0499dcdf2088bf7ca7be337f2a5d402b0e0c2