Merge "Clean up a flag for respecting nosensor and locked when docked." into...

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

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



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