Merge "[automerger skipped] Merge "Fix autogroupsummary bug" am: 15e5749d am: b5d8f6a6 am: 5378a82b -s ours am: bea36735 -s ours am: 766f0616 -s ours" into tm-qpr-dev am: c630d105 -s ours

am skip reason: Merged-In I0d14daaa69a94c1a3fe81b12d16b44e3a78281fe with SHA-1 9f292b56 is already in history

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



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