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

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

am skip reason: Merged-In I3d46e46db888bcf5a54faa009d96ce53611ca077 with SHA-1 29934060 is already in history

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



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