Merge "Don't enforce android.permission.TURN_SCREEN_ON in UDC." into udc-dev am: 4360e144 am: 1a4893e7 am: 9bba082d am: 59339262

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



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