Merge "Merge "add metrics for notification and group expansion" into nyc-dev am: 0f97b8fcbd am: 32b50d9c39" into nyc-mr1-dev-plus-aosp
am: 88a41ca185

* commit '88a41ca185856a5393fee54f321742a4aeeb584b':

Change-Id: I1ea836d4b07f6dfe06f272f2ae8be64b74b0a1b2