[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-a4385de6b6cd492c916b88aec2353f94" into tm-mainline-prod am: 28309d60 -s ours

am skip reason: Merged-In I58feaa693dd3ef4081e49f279eba19251e9d1ab0 with SHA-1 c9be2225 is already in history

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



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