[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: 70413a96 am: 67622b2d -s ours am: 74606818 -s ours

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

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



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