Merge "Notifications channels are not locked at first boot" am: 1dcde702 am: 4dca7937

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



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