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

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

Change-Id: I82ae89d3f611973df854d718cd699d07953ea7cc