[automerger skipped] Better status update am: f23096d7 -s ours am: ec6cf9c9 -s ours

am skip reason: Merged-In I0c919841d756ada6e94414e58f310635e4d8c12c with SHA-1 70bc2dae is already in history

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



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