Merge "Merge "Move the NotificationAccessConfirmationActivity component name to resource config so that it can be overlayed." into sc-v2-dev am: 9260cf28 am: 3cd54554"