Merge changes from topic "am-04870cc916db40ebb0847ad27beb28fa" into rvc-d1-dev-plus-aosp am: e486d799

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

Change-Id: I9a0f8ce842d4381920bf74cc13fe0be3b12b9295