[automerger skipped] Merge "DO NOT MERGE Fix behavior of getNotificationChannelGroups" into pi-dev am: 121e1f702c
am: 1998e17754  -s ours

Change-Id: I8ad42d285e99e491935ec716e5969405cb2640ba