Merge "Add strings to Settings.Secure for notification permission" into tm-dev...

Merge "Add strings to Settings.Secure for notification permission" into tm-dev am: 983602fc am: 457fa6f6 am: 74a09ada

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



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