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