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

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

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

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



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