Merge "Better status update" am: 7eeb66f2

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



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