Merge "DO NOT MERGE Correct physical orientation" am: 8f77b4861a am: f2317a66f8 am: b8d8f783ca

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1456317

Change-Id: Ibfa32b5d88c33e6d0bc360e07b7602c685a11638