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

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



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