[automerger skipped] Merge "Add and use config_deviceStatesToReverseDefaultDisplayRotationAroundZAxis" into tm-qpr-dev am: 8ce9a6d9b9 am: 9374f0f33f -s ours

am skip reason: Merged-In Ie9371b0f755d2d7852bc5244c5a06951a81051af with SHA-1 41d2239ad7 is already in history

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

Change-Id: I2b86c504c259eb09038768a0ef00513674c963ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>