Merge "[ECM] Declare MANAGE_ENHANCED_CONFIRMATION_STATES permission (Settings)" into main