[automerger skipped] Merge changes from topic...

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

am skip reason: Merged-In I03bd679b77f7ed8a65ba5fc59723b83a4254442c with SHA-1 bc357abc is already in history

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



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