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: e2150a74 am: 26d78c1a

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

Change-Id: I5d7e8e0488ec7f99d45d51a59f7aea12aeb9f04a