Merge "Ensure the device wakes up from doze when tapping expand button" into sc-dev am: ba1e18b5c7 am: 05615c1212

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

Change-Id: I3232efdb7c9015f38980d25978434e33ede679d6