[automerger skipped] DO NOT MERGE Correct physical orientation am: d4d89976ea am: 4d96e62e06 am: 9090d48003 am: eea28a4bc3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie5dcce4b554edd72121ffa59d3980a14a045dba2