Merge "Fix tabletop autorotate freezing the device in portrait" into...

Merge "Fix tabletop autorotate freezing the device in portrait" into tm-qpr-dev am: 1616dafa am: 28fa4b9b

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



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