Merge "Disable screen wake locks for cached apps" into udc-qpr-dev am: 929a1a87

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



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