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

Change-Id: I97fb6e08e7047aeb2c10d02627e0f389b621dd93