Merge changes from topic "am-70560489aa0542c99c9043781a2333f5" into rvc-d1-dev-plus-aosp am: 38f60684ba

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

Change-Id: I848ebe47054c1e2f21681dad2e71f2edbb7368f4