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

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

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



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