Merge "Better status update" am: 7eeb66f25d am: df98ac2917 am: ddaa025506

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

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