Merge "DO NOT MERGE Fix behavior of getNotificationChannelGroups" into pi-dev
am: 121e1f702c

Change-Id: I6849a9192494e08e6e475bab384ac8d1546af619