Merge "Disallow setting invalid importance when updating a...

Merge "Disallow setting invalid importance when updating a NotificationChannel" into udc-dev am: 8128beb1 am: 401c536c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21478864



Change-Id: I5f9c2be982ceecbd8a13f679353b7bd601210170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>