Merge "Merge "Fixed an issue where the phone would be stuck pulseExpanding"...

Merge "Merge "Fixed an issue where the phone would be stuck pulseExpanding" into sc-dev am: 17a6678d am: e02366fe" into sc-v2-dev-plus-aosp am: 0d1d2969

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

Change-Id: I3254c332746a32f36b45aaf11b73b8aaee944315