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

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

Change-Id: Idbfe0a6c64e8b2e4de8f3fcc8d88b7701efc194a