Merge "Support respecting nosensor and locked when docked." into tm-qpr-dev am: 088907e9 am: 6bca0c3e am: aee5c182 am: b70c0ed2

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



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