Merge "Prevent orientation request loop in override" into tm-qpr-dev am: 84903feb am: 28d7f6a5

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



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