[automerger skipped] Merge "Fixed an issue where the user could be stuck with...

[automerger skipped] Merge "Fixed an issue where the user could be stuck with pulse expanding" into sc-v2-dev am: 3ba0620e am: 9e08f02d -s ours

am skip reason: Merged-In I3398763141e8f828c00fb5d5184d64ffc66d3237 with SHA-1 a7617fc8 is already in history

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

Change-Id: I1774f0a743e07d98ebc240115dbd41cec71df8cd