[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-bf972dc425c64fb0857e01562822187d" into tm-mainline-prod am: f895d2b9 -s ours

am skip reason: Merged-In I9743fe08cccbd8b6a9e7b367e32fe3e597b81ec4 with SHA-1 ed57d6cc is already in history

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



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