[automerger skipped] Merge "Finalized Watch profile summary string" into...

[automerger skipped] Merge "Finalized Watch profile summary string" into tm-dev am: 954353d4 am: 78664c52 -s ours

am skip reason: Merged-In I1a6f276468d03433b70d508285a712e3c043a89c with SHA-1 3aa90038 is already in history

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



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