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

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



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