Merge changes from topic "tsuji-wakeup" into tm-qpr-dev am: e29ff090 am: 41e00245

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



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