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: b52e4584 am: bdc83919 am: 03da2019

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



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