Merge "Revert "Allow android.permission.TURN_SCREEN_ON for signature an..."" into udc-dev am: c1b615d8 am: 05cc4a50

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



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