Merge "Allow android.permission.TURN_SCREEN_ON for signature and privileged...

Merge "Allow android.permission.TURN_SCREEN_ON for signature and privileged apps" into udc-dev am: c96f6162 am: fea9c577

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



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