[automerger skipped] Merge "[DO NOT MERGE] Use orientation value from config...

[automerger skipped] Merge "[DO NOT MERGE] Use orientation value from config change event" into sc-dev am: 6251ebfb -s ours am: e42f526b -s ours

am skip reason: Merged-In Icd15712cd4821b7833a3373978a92f8b5959ac12 with SHA-1 a8e1bbf7 is already in history

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

Change-Id: I4428f1c0dc07e0edb311735cbafc0fd67d850896