Merge "AOD: Notification groups on Ambient Display" into oc-dev