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

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

Change-Id: If16926290130672f8cf6ea2e543d86d9471ba148