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: If187f5b794e679f9ed7f7c43acbe8c2892ea5432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>