Merge changes from topic "am-c578ca2d19f34632bed4427749a87116" into...

Merge changes from topic "am-c578ca2d19f34632bed4427749a87116" into tm-d1-dev-plus-aosp am: d281b00a -s ours

am skip reason: Merged-In Iccb457131d74a83b9f5cb8457833d7c5ea495b05 with SHA-1 921da951 is already in history

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



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