Merge "Clean up a flag for respecting nosensor and locked when docked." into udc-dev am: 56675d07 am: 219eeadd am: fff20b94 am: 3b73a088

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



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