[automerger skipped] Merge "Better status update" into udc-qpr-dev am:...

[automerger skipped] Merge "Better status update" into udc-qpr-dev am: 53a6f146 -s ours am: af11e8e7 -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: I4078daddebb849f23b2db01c60599493f1a64208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>