[automerger skipped] Merge changes from topic...

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

am skip reason: Merged-In I26dfc53b22817953839d9882398a502ea7293c08 with SHA-1 26aff6fb is already in history

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



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