[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-86d37df06f3b4cba87f03386fed73973" into sc-qpr1-dev am: 870c0fe4 -s ours

am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 cbda45eb is already in history

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



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