[automerger skipped] Merge "Disable screen wake locks for cached apps" into udc-dev am: c339d55d32 am: 5fa79c2e30 -s ours am: 173118a720 -s ours
am skip reason: Merged-In I1cf38ada2456c1cc1f367fad58ce95948d1b3a81 with SHA-1 4138a2e2e6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24107346
Change-Id: I00263eb21c51f92f0c6c567ebae4739df560d367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: