Merge "Merge "Prevent orientation request loop in override" into tm-qpr-dev...

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

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



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