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

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



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