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

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

am skip reason: Merged-In I80fabf3a64c55837db98ff316e7e5420129c001b with SHA-1 e9ec3227 is already in history

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



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