[automerger skipped] Merge "Respect "nosensor" and "locked" with...

[automerger skipped] Merge "Respect "nosensor" and "locked" with ignoreOrientationRequest being set" into tm-qpr-dev am: 099cdc6e am: 6891c60b -s ours

am skip reason: Merged-In I96dca18a561e2acf961a462d3a4db484f003be6f with SHA-1 4b038dd7 is already in history

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



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