Merge changes from topic "am-17d8054ee2eb47428323bea17b281c36" into...

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

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



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