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

Change-Id: Ic74620e9b9898d65ad98a5e884f5a233ec56a9b0