Merge "Disable screen wake locks for cached apps" into udc-dev am: c339d55d

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



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