Merge "Fix AppOps exception for notification channel toasts" into oc-dev am: 5c720a5f09
am: 5ce551ccc1

Change-Id: If724820013eed91bf8d0b4ac6d5d3f157e36fdec