Merge changes from topic "am-47da99b99c4047c98fbfc33f939b5089" into...

Merge changes from topic "am-47da99b99c4047c98fbfc33f939b5089" into rvc-d1-dev-plus-aosp am: 38e01b3d am: 43435b1a

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

Change-Id: Ie6b8c26262d4512bd571f3ea666d9d2f8f65105d