Merge "Support respecting nosensor and locked when docked." into tm-qpr-dev...

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

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



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