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

[automerger skipped] Merge changes from topic "inflate-signal" into rvc-d1-dev-plus-aosp am: 9da3d65f am: 9d5b3dcc -s ours

am skip reason: Change-Id I494cb93a2c72ff3df2ef45ad737c5606132e32d1 with SHA-1 39a60ddd is in history

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

Change-Id: I44a615f74b33bf7aa759fc0585462a11f4cc4b5a