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: 05615c12 am: 528c2df4

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

Change-Id: Ie0292dd699e000472ad8cb3d761df680f8dce32c