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

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

Change-Id: Iad2296b832b1533ec147bf131a1e709da2bdc505