[automerger skipped] Merge "Disable screen wake locks for cached apps" into...

[automerger skipped] Merge "Disable screen wake locks for cached apps" into udc-dev am: c339d55d am: 5fa79c2e -s ours am: 173118a7 -s ours am: 08b59910 -s ours

am skip reason: Merged-In I1cf38ada2456c1cc1f367fad58ce95948d1b3a81 with SHA-1 4138a2e2 is already in history

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



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