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: 6eedf863 am: f4ff9b7a

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

Change-Id: I9fc4c3c5af2e68e3e2f85327a6583950c9005519