Merge "Fix autogroupsummary bug" am: 15e5749d am: b5d8f6a6

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



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