[automerger skipped] Merge changes from topic "am-4f55cf354ee849c8a9efbca3e14ade7f" into rvc-d1-dev-plus-aosp am: 6811659f -s ours

am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc is in history

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

Change-Id: I1a98aeb45ba1eb97c6e924b881e1d34e69709249