Merge "standardize system notification IDs" into oc-dev am: 441162562b
am: 72eb5da93b

Change-Id: Icf0abd881615f16e85547b275edbf081d6ee1819