Merge "Remove expensive queries for lock task mode (screen pinning)" into...

Merge "Remove expensive queries for lock task mode (screen pinning)" into tm-qpr-dev am: fed657bf am: c6315c96

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



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