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

[automerger skipped] Merge "Disable screen wake locks for cached apps" into udc-qpr-dev am: 929a1a87 am: 8b74ff12 -s ours

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

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



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