Merge "Disable screen wake locks for cached apps" into udc-dev am: c339d55d am: 70413a96

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



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