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

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



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