Merge changes from topic "inflate-signal" into rvc-d1-dev-plus-aosp am: 9da3d65f

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

Change-Id: I9024c6ac14108e2f91f64618d97e401305cd92b2