Merge "Better status update" am: 7eeb66f2 am: df98ac29 am: ddaa0255 am:...

Merge "Better status update" am: 7eeb66f2 am: df98ac29 am: ddaa0255 am: 10ce7548 am: bb8ad146 am: 78fbd116

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



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