Merge changes from topic "am-17d8054ee2eb47428323bea17b281c36" into tm-d1-dev-plus-aosp am: b7eb510c

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



Change-Id: I50dca5873e1c47acce23f830a98d0359a8e9fae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>