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

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



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