Merge "Fixed an issue where the user could be stuck with pulse expanding" into...

Merge "Fixed an issue where the user could be stuck with pulse expanding" into sc-v2-dev am: 3ba0620e

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

Change-Id: I0918991d3982b919209b7cb70a3d8183960b5203