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

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

Change-Id: I54e8ab96e1393b85bb3ec263e8313699f0378f5b