[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-b344c51c0b2b40219ea014db7d70478f" into sc-qpr1-dev am: 98ef8f16 -s ours

am skip reason: Merged-In I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1 with SHA-1 bcebd3e9 is already in history

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



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