Merge changes from topic "am-4de3598fc3364a21a729360917e55627" into rvc-d1-dev-plus-aosp am: eda04f3d

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

Change-Id: I5187cf759b43bd630975b37ae96729952bbcd8a6