Merge "Some wake-ups can be considered unlock-intents" into tm-qpr-dev am:...

Merge "Some wake-ups can be considered unlock-intents" into tm-qpr-dev am: f9957304 am: 6eded5ef

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



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