[automerger skipped] Merge "Prevent autorotation during hinge movement" into...

[automerger skipped] Merge "Prevent autorotation during hinge movement" into tm-qpr-dev am: 74b7ca81 am: 8d4f47c0 -s ours am: e8cdfe15 -s ours am: cbc0e4c4 -s ours

am skip reason: Merged-In I1b07e1e84ab1cafb0f2794d62d99e114908fe840 with SHA-1 f50f8dcb is already in history

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



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