[automerger skipped] Merge "DO NOT MERGE Correct physical orientation" am: 8f77b4861a am: f2317a66f8 am: b8d8f783ca am: e432efb97b -s ours

am skip reason: subject contains skip directive

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

Change-Id: If1003df8af0ef58d703f3c9c781e4aff352fe104