Merge "Allow apps to downgrade importance in createNotificationChannel" into oc-dr1-dev
am: 3ca605e28c  -s ours

Change-Id: Iacd4376b1e1f665fb72ca6e4fd7b8cabff88dc7c