Merge "Ensure the device wakes up from doze when tapping expand button" into...

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

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

Change-Id: I8387c771e61152ef836abd56554b34cf61056872