[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-9eb43876b6f544bc8e5ec2647746fcca" into tm-mainline-prod am: a09aed35 -s ours

am skip reason: Merged-In I4c9fc065c7a4c96bf51a2d14a1eb1c7abe543a9a with SHA-1 ba7983e8 is already in history

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



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