Merge "Merge "Dismiss HUN group summary if user taps HUN group child" into...

Merge "Merge "Dismiss HUN group summary if user taps HUN group child" into udc-qpr-dev am: 692a8a06" into udc-qpr-dev-plus-aosp am: 888d188d

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



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