Merge changes from topic "am-741f8472fc2540b58147ecfdb6b79484" into...

Merge changes from topic "am-741f8472fc2540b58147ecfdb6b79484" into rvc-d1-dev-plus-aosp am: 61b4ea3a am: a932636e

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

Change-Id: I3547c0bedba238a85b34b50e941540663531fe37