Merge "Add new metrics categories for the two notification access screens." into mnc-dev