Merge "Merge "Add permission check in notifyWakingUp/GoingToSleep" into...

Merge "Merge "Add permission check in notifyWakingUp/GoingToSleep" into udc-dev am: fa25a8e1" into udc-dev-plus-aosp am: 59510b4f

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



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