[automerger skipped] Merge changes from topic "inflate-signal" into...

[automerger skipped] Merge changes from topic "inflate-signal" into rvc-dev-plus-aosp am: 8835581c -s ours am: 95d44c79 -s ours am: 99b5b185 -s ours

am skip reason: Change-Id I494cb93a2c72ff3df2ef45ad737c5606132e32d1 with SHA-1 8f90a92c is in history

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

Change-Id: I9457b9add58e9732be1db58900dd5b3138f4ddbf