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 am: aee5c182

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



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