[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-78ce7c7d21cc4fc2b73ed1a9923e4aaa" into tm-mainline-prod am: 1328ce1c -s ours

am skip reason: Merged-In Idbaf97c599bacba2122cbce2d047eb59262ac63e with SHA-1 96649093 is already in history

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



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