Merge "Disable screen wake locks for cached apps" into udc-dev am: c339d55d32

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

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