Merge "Changes to "Alarms and Reminders" permission" into sc-dev am: 39086c24fd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14095813

Change-Id: I644442b4d41b343bfc1aebcc2c42ac2f9dc7ce82