Merge "Merge "Add landscape support" into sc-dev am: 7384ba77 am: 2b58457f" into sc-v2-dev-plus-aosp am: b7ba1a9e

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

Change-Id: I1a5b0ce2f6661a5b40a7856f653165d3d9a6cfd4