[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: 412fd60e -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: Ia2107717fe02acf24fb625bb54a331569d10e679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>