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

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



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